Use proper module loading to avoid dependency issues