Add ability to do +short