Updated ID and Teller classes