Co Down gymnast Rhys McClenaghan wants a guarantee that there will be no repeat of the saga that dogged his Commonwealth Games build-up.
McClenaghan, along with Northern Ireland team-mates Eamon Montgomery and Ewan McAteer, were initially barred by the Federation Internationale de Gymnastique (FIG) because they are licensed to compete for Ireland in international competition.
The ruling was eventually overturned and McClenaghan, who won gold in pommel horse on the Gold Coast in 2018, went on to win silver nine days ago in Birmingham.