Handle Non-ambiguous Abbreviations

(also added empty functions)