Code clean-up and AddShapeProcessor, replaced custom IDIncrementor by NumberIncrementor