Bug fixes on RESTDataSource
View layer files added