Update classes usage