Move things around to make room for new external provider implementation