Refactor, now built on Symfony Console