Modify ##Logic and add ##CLI