Updated filters and init separated per file