Add validation and others