Added support for proxy models