Add space abstraction