Added return values for saving policies