Support HB 6007

Support HB 6007