Added user class and peep class