fixing indentation, adding dpn_object_id, ...