Optimize abiVersion usage