Updated to Component and Entity