Components small update