Improved task for adding/deleting swap