Start adding complex data types for State