More work on state classes