Update to match plugin heirarchy changes