Updated to reflect (hopefully) proper way to manage CFA in routes