Changed to use less of mongoid and more PORO