Improve translation and setModified flag control