Refactoring to use new version of @In annotation.