Improved data and abbreviationswq