Add validations and specs