Updated components