Updates to support Supplier and @in