Some minor updates to handle mock data