Update and Remove functionality