Updated for singleton Filter