Added support for remove method