Added insert/remove methods