Began adding component-entity framework