Adding support for manual references using @Reference