Added support for C-w