Added swapable option