Added option to disable storageEnity validation