Changed Identifier and deprecated the old system