Update keys, add tracing info, remane to LPIS