Better path management