Updated Filter class to Singleton class