Updated derived path support