Remodel with to_bson in mind