Update classes and sample