Rack and refactored Space