Added returns for all commands