Add preliminary support for items