Change regex support, add partial path resolution