Refactored, removed DrawableComponent since it was useless