Added number parsing