Some refactor and changes to adapt to new neuroml version