Validation

Added more requirement fields.