Restructured server-side entities