Backwards compatibility for Eden, take 2