Added multiples folder import/watch support