Data Model improved a bit