Update parser methods and update main cs