Changed the class name-convention, added remove operation