Rewriting Core\Form to use DI