Deprecate System
Add CuboidType