Add support for new hax