Updated to support full 16bit address.