Seperation into entity and Component