Add some specs and validations