Updates to logging