Add JCB support, update type codes to match documentation, and get rid of