[WIP] Add long name parsing