Moved loaded components to Entity class