Replaced primitive instance classes by state objects