Fetching only required fields in list + general refactoring