Work on analyzers and entities