Support hoa/core 2.x