Fixed LOGIC-127, nom swapping now preserves vectors and maps

Signed-off-by: amin <nada.amin@epfl.ch>