Parser skeleton structure updated in order to satisfy new spec.