Add support for with statements