Fix Classes and Sample