Adapted Parser's new template parameter structure