Improve setting paths