enhance contacts: contact classes, RT#16819