Refactoring @Require implementation to better suit Darcy style