Added support for remove method, throws exceptions