converted the "With" handlers to extension methods.