Use new proplist format here instead?