Analyzer and TspFileHandler updated. More tests must be done.