Expand to include fan accounts