Added favorites support