Update to use pool