Added template, lists and filters