Fixed required fields