Changed conf structure