Feature/fix keyword parser r0

add back keyword parser
I don't see why you need this