Add Waterloo Handler