Change Id to a Class