Updated sample classes