Feature/wiki connector