Solved some minor issues with the new datamodel. Still facing some problems in showing the data