Move identifier related patches to submodule