Added some configuratio handling.