Modified code to support Eve 0.18