Added the analyzer code and updated some details