Improved support for Hack