Adding fields for Resource entity
Merge conflict resolved