Swappable added