Revise if this needs to be a thread safe collection