Restructured client