Core changes to demo files