Parser: Refactor list