Refactored entity structure + support sco organization