Updating code and validations