Compatibility with latest Ekeko