Added several state related classes