Replace template alias with normal struct because VS can't handle the truth