templates improvements; maps and lists