Refactoring NCDB service