Added module support