Migrated to new 0.9 commands.