Added version checks