Modified core templates