Issue #250 - Edit claim entity
Issue #250 - Adding new entities