Implemented WBTD support and fixed CAT062I185 implementation