Added parsing functionality