Get apollo plugin ready for #31