Added additional field types to dot lookup