Added version check to ensure correct versions