Add parsing of known parameters