Added support for changing players