Improve demo
Fix 'all' classes