Added Aging and Class