Standard template improvements