Add support for up to 15 numeric value expansions