Move specialCases and stopSpace to separate object