Mongo model refactoring - work in progress