Fixed insert(), remove() and save()