contact and address classes added