Reworked DataModel