Adding fetching logic