Add class type, fix copyright year.