updates for new rainutil parser implementation