Updated to work with heist 0.12