Porting key-values to being dls

fix for #1041