More flexible plugin includes