Fixed missing reqiured fields