CLEANUP use Supplier references as Instance reference