fix user collection and model