Added classes for user and email