Module fields refactoring