Update to use handlers