Make required fields logic more simple