Added remaining fields