Added more to the Email object