move to nyaruka eav until performance issue is merged