Restructured implementations