Changing template mgmt a bit