Add pre-compatibiltiy checks