Handling of new Analysis Method lines and some refactoring
merge