Updated add and remove scripts