Add and translate updates from #61