Move collection method out of router