Added hashing and salting