Added some types and validations