Fixed template for better boilerplate support