Change allowed values and required fields