Update format-manager to be more efficient