Better api version support