Added record syntax to basic types + changed state record names