Ng schema update, added simplification demo