Added some field initializations