Use Suppliers instead of instances