Added version detection