Adding mock data and more