Removed PropsMap, improved AABBs