Added more checks on columns which are required