Fixed token ranges for literals
Added import statements