Handler list now building correctly