diff --git a/senlinclient/common/utils.py b/senlinclient/common/utils.py
index cc6382d2..43b59eb2 100644
--- a/senlinclient/common/utils.py
+++ b/senlinclient/common/utils.py
@@ -158,9 +158,10 @@ def process_stack_spec(spec):
         env_paths=spec.get('environment', None))
 
     new_spec = {
-        'name': spec.get('name', None),
-        'rollback': spec.get('rollback', False),
+        # TODO(Qiming): add context support
+        'disable_rollback': spec.get('disable_rollback', False),
         'parameters': spec.get('parameters', {}),
+        'timeout': spec.get('timeout', 60),
         'template': template,
         'files': dict(list(tpl_files.items()) + list(env_files.items())),
         'environment': env
diff --git a/senlinclient/v1/shell.py b/senlinclient/v1/shell.py
index 93456c06..295f8439 100644
--- a/senlinclient/v1/shell.py
+++ b/senlinclient/v1/shell.py
@@ -122,7 +122,8 @@ def _show_profile(sc, profile_id):
 
     if profile.type == 'os.heat.stack':
         formatters['spec'] = utils.nested_dict_formatter(
-            ['name', 'rollback', 'parameters', 'environment', 'template'],
+            ['disable_rollback', 'environment', 'files', 'parameters',
+              'template', 'timeout'],
             ['property', 'value'])
 
     utils.print_dict(profile.to_dict(), formatters=formatters)