Added support for abbreviations and folders.