Merge command system to new framework