Updated after class renamed