Added classes for users and contacts.