Make sure we return all fields that are possible