Address review comments and add panic sections