added module support