add support for non-wim terminals