Switched to OO dictionary lookup.