Add full support for NAWS