Add support for folder links
Add support for multiple location