Modified to simplify Data Model