Scrutinizer enhancements