Made config more explicit.