Add full string parsing. Tweak naming scheme.