Improve handling of space context