logging and dao changes