Better path flexibility