Separate module and fix module loading