Updated for different salt format