Added module name and further refactoring fixes.