Updated class APIs