DOC Entity modifying improved