Feature/update behavior