Add basic module support