Make paths more robust with info
Use passed in active & sub states