Added conf stuff