demo: Update code from standalone projects