Added propper loging and configuration