Modify interface to allow for safe concurrent access