More endpoints and deeper path support