Added conf handling