Claims update

see #183 #268 #314