Use new class interface and update copyright information