Support HB 30

Support HB 30