common updates to work with graph extension