adding a few adjustments to validate mandatory elements