Support for multiple Paths and Bugfix