Huge frontend entity changes