Adding support for itemController