Update and add new class