Setting required fields properly