Add new classes to manage state of items.