Improve version support

Change-Id: I86751692d1c97b3702c041a69451833fdaf20e46