Improved not_renewed parser