Improved commonjs alias and service support