Added handling for a single feed