Pass around plugin id rather than name