Resolve variables in paths

Here is modification to be able to have '@' variables inside path values well resolved. For example :