Added support for remove