Added support for removing and updating