Reduce complexity in project model