Modified the data model to only include necessary tables