Updated to harp 0.10.x