Fix module loading. Prepare for tagging