Tracking Filter Class with delegated methods
Minor Fixes