added missing required value checks