Added ability to set timeout in add and remove.