Refactored to request all data from content script listener