Simplified data model to remove many-to-many relationships