Updated Classes