Adapted code to latest Ekeko changes