added remote module support