Improve command system.