Add variable expansion to config parser