Fixing module abstraction.