Added consistency TODO items
Added consistency TODO items