Update to match Joga+1 standards