Add marshalling as module