Added support for favorites