Fix #7 by adding abbreviations