Added all (?) required fields