Some editting on entities