Removal of data handlers
Merged data handler and model classes