Using shorter prefixes. Closes #45