Support of 16 bit values and some builders changes