Added line number support for specific window commands