SW-20 Added parse methods