Added some basic configuration