Improve SubTemplate design