added rudimentary module support