More dynamic paths. Less hard code