Cleaned up the CollissionShape loading to be on the entity type instead of the entity