Updated components class