Added Schema and Data Fetching