Removed ReferenceSupplier (use Supplier instead)