Add logging
Change config options