Adding missing functionality from #64