Perform refactoring for implementing filters in future