Issue #2070821 by DamienMcKenna, pounard: Major re-architecture to how supported entities are handled.