Added migrations and validations