[WIP] Enhanced Retirement workflow related automate model changes