Basic parsing functionality added