Cleaned up and added mongoid models