Moved GetSpace guts to persister