Improve path and property handling.