Update to be compatible with hastache >= 0.6