Added support for more data feeds