Modified further changes to rectify schema