Added version check