Add pre-XPI validation method

Pinging @Gozala