Simplify compatibility logic