Improve wrappers spaces