Object & Model class updates

+Mail class fix