Adding commands
Other changes