Added number prefix parsing