Added validations & user authentication