Added configuration stuff