modifications to support ealib namespace.