added fields to some classes