Improve Studio support. Better labels.