Refactor NStationaryParser