Adding ResolveStoreEntity event