Refactored the analyzer schema.