Added some flexibility to some commands