Template modifications