Improved data-driven schema type derivation
Better default number handling