Data definition tweaks