Route modified to work with yaml