Small API Change, Preparation for new command system