Updating plugins, removing that underscore splitting finally