Compatibility check added