Added virtual folder support