Fix dependencies
Fully use Modules