Added consistencies and TODOs