Some rewordings, add notification plan table