Refactor to prepare for pipes implementation