Re-Fixed the issues for date and required fileds