Added constructors and resolved a TODO.