Updated TODO. Design improvement.