Adding support for less output