Preserve features that are added on demo creation, #76