Improved list templates