Added right version of commandbase