Modified template to reduce warnings