Change argument keys and add Marmalde