Refactored list template