Add move and swap