Fix datastore validation exception
Add transaction to match creation