Restructure for services to save episodes