Updated to support new boxes for non-space stuff