Added full logging