Addding/editing/removing performance improved