Make abbreviation optional