Refactor out the separate collection controller