FORGE-1334: Improved selector and traverser for API versions