Add todos for thread safeness