Add swap support