Added basic configuration