More flexible favourite system