auto-update afew more classes