improve data keys customization