Changing handler to use Lazy instead of volatile and locks