Adding data models and cleaning up