More refactoring and added new filters