Related content refactor