add more version support