Updates to parser and elastic structure

But still not perfect