Moved template registry functionality to superclass