Adjusted general templates