Added support for short keys; Addon modified with nan