Make it a plugin