Added support for swappable models