Finished the new structure of filter