Made boiler calls generic