Identify more fields based on dispatch code