Changed IdPattern to use identifier instead of direct string from name