[TASK] Structural changes on fund/trust