Addressed TODOs