Added Person and Kiosk classes