Changed Data Model upon agreement with Andrew.