Added scrutinizer support