Feature/adapter language fix