Added cross-compatibility between different versions