Properly mark required fields