finish adding support for extra items