Add parsing for None