Added SupplyBlock support