Added validations and usernames