Added some more db fields to better handle rejections