Changes confirming template hierarchy