Further additions to single template file implementation.