added more commands functionality