Scrutinizer enhancements
Scrutinizer enhancements