Adding upto 4 suffixes for entity names and other changes