Updated to replace core fields instead of creating new ones