Improve create workspace ability