Improved parser. Implemented integration components.
Improved Diff