Added a property key for modifierId and utf-8 file encoding

Added a property key for modifierId and utf-8 file encoding

FYI- Next pull will be coming from sprint5 branch