OOIION-1789: Create dataset instead of activate persistence