ETRO-675 Added version support