Removed Singleton in Filter