Move collector to it's own model file