adding support to fetch second level endpoints