Parser changes, fix attempts