changed state classes to maintain static instances.