Add rapidjson, rest changes