Added more fields to models & corrected formats