Added compability checking