Added command -> command id mapping