Added handler re-registering functionality