Added swap support