Adding support for lazy operations