Added entity onSave, onLoad and key onDelete invocation