Added keyvals and str->kw