Adding sal-compatibilty feature