Added support for actor selection