Changes for memory swap