Add Callbacks and update todo list