Converting the wrapper templates to new flags