Minor changes and added new salt states