Add assoc data in Model, not in Query. Add contain option