Added favorite handling