Refactor the Entity to make better use of composition, allowing for expansion.