Adding universal module support