Added support for swappable user models