Adding some changes and validations