Update to haas v0.6.0

Integrate with haas v0.6.0