Added support for removing items