Adding TAG with keys only
Adding parsing of string literals