Prep for cs3a support and new path logic