Intergrated the work of the State Class