Added datastore wrapper around security context