Done CompositeQuery and below