Added path handling features