Add inherent number support