Finish adding custom module path support