Snapshot handler add at Outlet_Parameters, some small fixes