NXP-15845: better extensibility