I think those are two good defaults. Think an extension to that would be pulling in through relay lists