Adding basic configuration stuff