Added some stuff for list and change commands.