Remove TODO and make update interface nicer