Adding support for limit