Added encryption and validations