Improved support for super stars