added more fields for lookup