Added multi-feed support