Adding support for statements in limit