Add marshalling for program