Finish converting ServerBackedMap to new System