Updated databse TODO's