Added headers and support for other elements into intepreter and output.