Changed paths to static