Added dynamic paths support