Improved QML support