Further changes due to Issue #21 : refactor parserutils