Adding default commands
Bugfix