Routes updated to match specs