Improve workspace autoloading

Fix #62