added more fields to fetch