Updated Salt functionality