Upgraded to latest hobbit-contrib