Some rewrite to plugin manager