Updated the sample classes