Fix builder model with collection