Another step towards template support
Slightly more semantic variable name