Add remaining errors plus a lookup mechanism.