adding support for MainContent variables in DataModels and cleaning up imports