Refactored modules (internal)