Added missing long and short base forms in the interactive mode.