Added support for BufOnly command