Updated components controller