Added save operation support