Improved info template structure