Removed dependency on Foundation
Added insert/remove methods