Added more fields and formatted all of them