Upgrade to follow Gora 0.5-SNAPSHOT