added data models for all data at hand
need to test if they function well