Updated to support remove.