Updated Filter class
Updated InputPump class