Added logger & stuff