Be safer when mapping state value.
Get basic management for items together.

... Still need management for sets.