Added keyword support (true, false, null...)