more templates plus support code changes