Simplified constraints and started working on data model.