More logging, rename service to logger