Refactored modules