Improved and documented number support