Added the check on required Fields etc