Changed handlers to be instanced.