Handle more version cases