NXP-14879: Refactor to have dedicated class per aggregate type