Reworked the fields, and the fetching