sw changes to new marshaller and cmdEntry struct