Adjusted Filter to the new Saveable interface