Refactor NBKR