Bug with old modules fixed, small refactoring.