Started distinguishing cli and core