Refactor Filters and add Container filters