Final commit: parser added