Added new classes and fields.