Extract actions
Update todo