Added in GUI and Windows EXE CLI