Make OneCLI function with new changes to Core.