Updated extension to current version of toolbar