Increase primary template flexibility