Temporarily remove CreateOrUpdate to fix serialization errors