Refactored in module