Feature/multiple updates