Swap id to class update