Add filters, templates, log definitions and tests