Add validations and listings