fix: logging
fix: adopting the key shape change