Builder updated to support 32bit