Add-hock support for proxy and inherited models