Issue #6 (Modular Rewrite using Dependency Injection)