Updated for trunk of Hazeltask