DOC Entity creation/remove improved