Added State type and converter