Switched over to pluginlib rather than hardcoded classes