added support for rhino & amd modules