removed usage of query based feature
added persisting resource set creator method