Fixed remove method
Added UML for extension objects