Added path resolving.