Minor Edits

Capitalized array keys for direct compatibility with template handler
and  added span support.