Better path handlind