Details after peerreview refactor