Added swap request accept and abort