Adding support for multiple feeds