Add "with" support