Make it compatible with legacy