Add validators
Fix case of Analyzer