Changed types to reflect strictly numeric values