Refactor NcApi #34