Adding support for any combination of path and function tokens.