Fixed hard-coded paths that should be variables