Refactor Code. New filters system