Merge with OpenCML module
Add claim ID in views