Bug fixing
Extend space features